Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 7 Jan 2012 20:12:05 +0000 (12:12 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 7 Jan 2012 20:12:05 +0000 (12:12 -0800)

Trivial merge